Various fixes

diff --git a/debian/docs b/debian/docs
index ddb9a541bab4dbf7ed743434c7b83576d7c71563..fac001e292d679f2c82aa2f9a3dd0b540a738008 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
-README
 README.*
+debian/doctmp/*

diff --git a/debian/rules b/debian/rules
index 85f92a2226292667acbacbea6e3abe17c78495aa..c8d8d9944249558bd48efa3c05eae379d50f6799 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ build-stamp: configure-stamp
        mkdir debian/doctmp
        # Add here commands to compile the package.
        $(MAKE)
+       $(MAKE) doc
        chmod u+x testo
        -$(MAKE) check
        #cd doc && make doc.dvi
@@ -65,7 +66,7 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/gpsbabel.
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/gpsbabel
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/gpsbabel/usr
        #install gpsbabel $(CURDIR)/debian/gpsbabel/usr/bin
 
 
@@ -77,7 +78,7 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installchangelogs ChangeLog
+       dh_installchangelogs
        dh_installdocs
        dh_installexamples
 #      dh_install